From 9d00f7e5c56e3a8d194d159004efd45476219e55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 9 Jul 2021 15:39:09 +0200 Subject: [PATCH] debian/patches: Prevent usage of web-fonts and external links in docs --- .../debian/Disable-web-fonts-for-now.patch | 210 ++++++++++++++++++ .../debian/templates-Remove-html5shiv.patch | 22 ++ debian/patches/series | 2 + 3 files changed, 234 insertions(+) create mode 100644 debian/patches/debian/Disable-web-fonts-for-now.patch create mode 100644 debian/patches/debian/templates-Remove-html5shiv.patch diff --git a/debian/patches/debian/Disable-web-fonts-for-now.patch b/debian/patches/debian/Disable-web-fonts-for-now.patch new file mode 100644 index 0000000000..5c91ce9b1c --- /dev/null +++ b/debian/patches/debian/Disable-web-fonts-for-now.patch @@ -0,0 +1,210 @@ +From: Simon McVittie +Date: Thu, 15 Apr 2021 13:41:44 +0100 +Subject: Disable web fonts for now + +The way this works is still changing upstream, and getting the +correct licensing and source code for the Red Hat font (ITP: #986999) +is not really in the scope of packaging gi-docgen. + +Forwarded: not-needed, Debian-specific +--- + .../gi-docgen/gidocgen/templates/basic/fonts.css | 176 --------------------- + .../gi-docgen/gidocgen/templates/basic/style.css | 1 - + 2 files changed, 177 deletions(-) + +diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css b/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css +index ce790e7..0a01b93 100644 +--- a/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css ++++ b/subprojects/gi-docgen/gidocgen/templates/basic/fonts.css +@@ -3,179 +3,3 @@ + * + * SPDX-License-Identifier: Apache-2.0 OR GPL-3.0-or-later + */ +- +-/** +- * RedHat Fonts taken from https://github.com/RedHatOfficial/RedHatFont +- * License: SIL Open Font License 1.1 http://scripts.sil.org/OFL +- * +- * SourceCodePro Fonts +- * License: SIL Open Font License 1.1 https://scripts.sil.org/OFL +- */ +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-Regular.woff2") format("woff2"), +- url("RedHatDisplay-Regular.woff") format("woff"); +- font-style: normal; +- font-weight: 400; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-RegularItalic.woff2") format("woff2"), +- url("RedHatDisplay-RegularItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 400; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-Medium.woff2") format("woff2"), +- url("RedHatDisplay-Medium.woff") format("woff"); +- font-style: normal; +- font-weight: 500; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-MediumItalic.woff2") format("woff2"), +- url("RedHatDisplay-MediumItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 500; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-Bold.woff2") format("woff2"), +- url("RedHatDisplay-Bold.woff") format("woff"); +- font-style: normal; +- font-weight: 700; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-BoldItalic.woff2") format("woff2"), +- url("RedHatDisplay-BoldItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 700; +- font-display: fallback; +-} +- +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-Black.woff2") format("woff2"), +- url("RedHatDisplay-Black.woff") format("woff"); +- font-style: normal; +- font-weight: 900; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Display"; +- src: local('RedHatDisplayWeb'), +- url("RedHatDisplay-BlackItalic.woff2") format("woff2"), +- url("RedHatDisplay-BlackItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 900; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-Regular.woff2") format("woff2"), +- url("RedHatText-Regular.woff") format("woff"); +- font-style: normal; +- font-weight: 400; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-Italic.woff2") format("woff2"), +- url("RedHatText-Italic.woff") format("woff"); +- font-style: italic; +- font-weight: 400; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-Medium.woff2") format("woff2"), +- url("RedHatText-Medium.woff") format("woff"); +- font-style: normal; +- font-weight: 700; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-MediumItalic.woff2") format("woff2"), +- url("RedHatText-MediumItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 700; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-Bold.woff2") format("woff2"), +- url("RedHatText-Bold.woff") format("woff"); +- font-style: normal; +- font-weight: 900; +- font-display: fallback; +-} +- +-@font-face { +- font-family: "Red Hat Text"; +- src: local('RedHatTextWeb'), +- url("RedHatText-BoldItalic.woff2") format("woff2"), +- url("RedHatText-BoldItalic.woff") format("woff"); +- font-style: italic; +- font-weight: 900; +- font-display: fallback; +-} +- +-/* Do not fall back to locally installed SourceCodePro, as there are +- * known bad copies being distributed to this day +- */ +-@font-face { +- font-family: 'Source Code Pro'; +- font-style: normal; +- font-weight: 400; +- src: url("SourceCodePro-Regular.ttf.woff") format('woff'); +- font-display: swap; +-} +- +-@font-face { +- font-family: 'Source Code Pro'; +- font-style: italic; +- font-weight: 400; +- src: url("SourceCodePro-It.ttf.woff") format('woff'); +- font-display: swap; +-} +- +-@font-face { +- font-family: 'Source Code Pro'; +- font-style: normal; +- font-weight: 600; +- src: url("SourceCodePro-Semibold.ttf.woff") format('woff'); +- font-display: swap; +-} +diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/style.css b/subprojects/gi-docgen/gidocgen/templates/basic/style.css +index 8ff4bf1..434c2a9 100644 +--- a/subprojects/gi-docgen/gidocgen/templates/basic/style.css ++++ b/subprojects/gi-docgen/gidocgen/templates/basic/style.css +@@ -5,7 +5,6 @@ + */ + + @import url("pygment.css"); +-@import url("fonts.css"); + + /********************************* + * LIGHT THEME diff --git a/debian/patches/debian/templates-Remove-html5shiv.patch b/debian/patches/debian/templates-Remove-html5shiv.patch new file mode 100644 index 0000000000..95dd66bb5e --- /dev/null +++ b/debian/patches/debian/templates-Remove-html5shiv.patch @@ -0,0 +1,22 @@ +From: Simon McVittie +Date: Thu, 15 Apr 2021 14:09:42 +0100 +Subject: templates: Remove html5shiv + +Internet Explorer is dead, or really should be, so let's not generate +references to external resources that can be a privacy breach. +--- + subprojects/gi-docgen/gidocgen/templates/basic/base.html | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/subprojects/gi-docgen/gidocgen/templates/basic/base.html b/subprojects/gi-docgen/gidocgen/templates/basic/base.html +index e353208..7c83cae 100644 +--- a/subprojects/gi-docgen/gidocgen/templates/basic/base.html ++++ b/subprojects/gi-docgen/gidocgen/templates/basic/base.html +@@ -47,7 +47,6 @@ SPDX-License-Identifier: Apache-2.0 OR GPL-3.0-or-later + + {% endif %} + +- + + + diff --git a/debian/patches/series b/debian/patches/series index 6bca2e8321..73b6ebdf7c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch +debian/Disable-web-fonts-for-now.patch +debian/templates-Remove-html5shiv.patch -- 2.30.2